From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 15 Jun 2015 11:27:53 +0000 (+0200)
Subject: x86/MSI: partly restore commit 73cb5d43a8 (build fix)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3093
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=2fdf3c433a8cba33fae623d7138c173e111b81cb;p=xen.git

x86/MSI: partly restore commit 73cb5d43a8 (build fix)

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h
index 4c62a3a9fd..abbecf8105 100644
--- a/xen/include/asm-x86/msi.h
+++ b/xen/include/asm-x86/msi.h
@@ -65,8 +65,13 @@ struct msi_info {
 };
 
 struct msi_msg {
-	u32	address_lo;	/* low 32 bits of msi message address */
-	u32	address_hi;	/* high 32 bits of msi message address */
+	union {
+		u64	address; /* message address */
+		struct {
+			u32	address_lo; /* message address low 32 bits */
+			u32	address_hi; /* message address high 32 bits */
+		};
+	};
 	u32	data;		/* 16 bits of msi message data */
 	u32	dest32;		/* used when Interrupt Remapping with EIM is enabled */
 };